From 589d8fae088b3a9092e2206abc6ad46e8a0d20dd Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Wed, 5 Nov 2003 09:07:50 +0000
Subject: [PATCH] bitkeeper revision 1.558 (3fa8bde6eQgIO9tzKu1KolYWJYKnxg)

xen_log.c, hypervisor.h:
  Bug fixes. Minios shoudl work again now.
---
 extras/mini-os/h/hypervisor.h | 17 +++++++++++++++--
 tools/misc/xen_log.c          |  1 -
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/extras/mini-os/h/hypervisor.h b/extras/mini-os/h/hypervisor.h
index 4c4d752615..3afd245fd6 100644
--- a/extras/mini-os/h/hypervisor.h
+++ b/extras/mini-os/h/hypervisor.h
@@ -129,7 +129,8 @@ static inline int HYPERVISOR_yield(void)
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
-        : "=a" (ret) : "0" (__HYPERVISOR_yield) );
+        : "=a" (ret) : "0" (__HYPERVISOR_sched_op),
+        "b" (SCHEDOP_yield) );
 
     return ret;
 }
@@ -139,7 +140,19 @@ static inline int HYPERVISOR_exit(void)
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
-        : "=a" (ret) : "0" (__HYPERVISOR_exit) );
+        : "=a" (ret) : "0" (__HYPERVISOR_sched_op),
+        "b" (SCHEDOP_exit) );
+
+    return ret;
+}
+
+static inline int HYPERVISOR_stop(void)
+{
+    int ret;
+    __asm__ __volatile__ (
+        TRAP_INSTR
+        : "=a" (ret) : "0" (__HYPERVISOR_sched_op),
+        "b" (SCHEDOP_stop) );
 
     return ret;
 }
diff --git a/tools/misc/xen_log.c b/tools/misc/xen_log.c
index 39ed848722..a2ecb33021 100644
--- a/tools/misc/xen_log.c
+++ b/tools/misc/xen_log.c
@@ -1,7 +1,6 @@
 
 #include <netinet/in.h>
 #include <sys/types.h>
-#include <tcpd.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
2.30.2